gtk: Put private functions in headers and include those

This is part of a bunch of fixes for gcc complaining about
-Wmissing-declarations.

It puts functions into headers and includes those headers both where the
functions are defined and where they function are used.

diff --git a/gtk/fnmatch.c b/gtk/fnmatch.c
index f76a1c62d396ad33b35cb6e9e2ffdab0e008ebc6..0031331cb16a8a5d92114827a876d7db3efefff8 100644 (file)
--- a/gtk/fnmatch.c
+++ b/gtk/fnmatch.c
@@ -28,6 +28,9 @@
  */
 
 #include "config.h"
+
+#include "gtkprivate.h"
+
 #include <string.h>
 
 #include <glib.h>

diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h
index 2ffee1554adfa8a732a97ed60c2d5c1d4b45532e..9fcaff84145dba5edb4b3574c18f3914c0b5e45d 100644 (file)
--- a/gtk/gtkcustompaperunixdialog.h
+++ b/gtk/gtkcustompaperunixdialog.h
@@ -58,6 +58,7 @@ GtkWidget *       _gtk_custom_paper_unix_dialog_new                (GtkWindow
 GtkUnit           _gtk_print_get_default_user_units                (void);
 void              _gtk_print_load_custom_papers                    (GtkListStore *store);
 void              _gtk_print_save_custom_papers                    (GtkListStore *store);
+GList *           _gtk_load_custom_papers                          (void);
 
 
 G_END_DECLS

diff --git a/gtk/gtkfilechooserdefault.h b/gtk/gtkfilechooserdefault.h
index 8b2f3f3ae1dfde27253162d7d58bf43e34813a42..3c90de2100a5742c4047585fceba396891bdc970 100644 (file)
--- a/gtk/gtkfilechooserdefault.h
+++ b/gtk/gtkfilechooserdefault.h
@@ -33,6 +33,8 @@ typedef struct _GtkFileChooserDefault      GtkFileChooserDefault;
 GType      _gtk_file_chooser_default_get_type (void) G_GNUC_CONST;
 GtkWidget *_gtk_file_chooser_default_new      (void);
 
+gchar *    _gtk_file_chooser_label_for_file   (GFile *file);
+
 G_END_DECLS
 
 #endif /* __GTK_FILE_CHOOSER_DEFAULT_H__ */

diff --git a/gtk/gtknumerableicon.c b/gtk/gtknumerableicon.c
index 3a1a6fad1cff2df3e577f99073173296c5d7f12f..a1131f576e1649cfd5e2fd05510771e6a3de5763 100644 (file)
--- a/gtk/gtknumerableicon.c
+++ b/gtk/gtknumerableicon.c
@@ -41,6 +41,7 @@
 #include <config.h>
 
 #include "gtknumerableicon.h"
+#include "gtknumerableiconprivate.h"
 
 #include "gtkicontheme.h"
 #include "gtkintl.h"

diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index c4e7e0cd85750fd62452ed3e9e254330e016eb7d..1ab622e1949135b67345cb7d45e34f2b0809bebc 100644 (file)
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -30,6 +30,10 @@
 #include "gtkprintoperation.h"  /* for GtkPrintError */
 #include "gtkintl.h"
 
+#ifdef G_OS_UNIX                /* _gtk_load_custom_papers() only on Unix so far  */
+#include "gtkcustompaperunixdialog.h"
+#endif
+
 #include "paper_names_offsets.c"
 
 
@@ -454,8 +458,6 @@ gtk_paper_size_is_equal (GtkPaperSize *size1,
                  gtk_paper_size_get_name (size2)) == 0;
 }
 
-GList * _gtk_load_custom_papers (void);
-
 /**
  * gtk_paper_size_get_paper_sizes:
  * @include_custom: whether to include custom paper sizes

diff --git a/gtk/gtkprivatetypebuiltins.c.template b/gtk/gtkprivatetypebuiltins.c.template
index 8f1034e195a5c72506e345d6d7b133ee092606fc..b8db5a43856c78ba387442bda4aa148d66451d17 100644 (file)
--- a/gtk/gtkprivatetypebuiltins.c.template
+++ b/gtk/gtkprivatetypebuiltins.c.template
@@ -1,6 +1,7 @@
 /*** BEGIN file-header ***/
 #include "gtk.h"
 #include "gtkprivate.h"
+#include "gtkprivatetypebuiltins.h"
 
 /*** END file-header ***/
 

diff --git a/gtk/gtkroundedbox.c b/gtk/gtkroundedbox.c
index 2b119824892e3b165cd903f751b6bf39de1bfab7..4aeffcde055f10734b0f6aa398a6ab8b86b71a9d 100644 (file)
--- a/gtk/gtkroundedbox.c
+++ b/gtk/gtkroundedbox.c
@@ -152,6 +152,7 @@ gtk_css_border_radius_grow (GtkRoundedBoxCorner *corner,
       corner->vertical = 0;
     }
 }
+
 void
 _gtk_rounded_box_grow (GtkRoundedBox *box,
                        double         top,

diff --git a/gtk/gtkroundedboxprivate.h b/gtk/gtkroundedboxprivate.h
index 61b16e8217e5d59004b7947f1f62f41ca972e10c..a345a5c57143d2fc2ee9d0f6e8f7399576a1c8fb 100644 (file)
--- a/gtk/gtkroundedboxprivate.h
+++ b/gtk/gtkroundedboxprivate.h
@@ -54,6 +54,11 @@ void            _gtk_rounded_box_apply_border_radius_for_context (GtkRoundedBox
                                                                   GtkStyleContext  *context,
                                                                   GtkJunctionSides  junction);
 
+void            _gtk_rounded_box_grow                           (GtkRoundedBox       *box,
+                                                                 double               top,
+                                                                 double               right,
+                                                                 double               bottom,
+                                                                 double               left);
 void            _gtk_rounded_box_shrink                         (GtkRoundedBox       *box,
                                                                  double               top,
                                                                  double               right,